Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable29] Encryption trash fixes #3484

Merged
merged 9 commits into from
Dec 13, 2024
Merged

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Dec 12, 2024

Backport of #3481

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested a review from icewind1991 December 12, 2024 17:24
@backportbot backportbot bot added the 3. to review Items that need to be reviewed label Dec 12, 2024
@backportbot backportbot bot added this to the Nextcloud 29 milestone Dec 12, 2024
@icewind1991 icewind1991 changed the title [stable29] [stable30] Encryption trash fixes [stable29] Encryption trash fixes Dec 12, 2024
Signed-off-by: Robin Appelman <robin@icewind.nl>
… handles this properly*

*: expect for the mentioned bug

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 force-pushed the backport/3481/stable29 branch from d6aca02 to 5a0bbb3 Compare December 12, 2024 17:38
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 force-pushed the backport/3481/stable29 branch from 5a0bbb3 to 1366597 Compare December 13, 2024 14:38
@icewind1991 icewind1991 marked this pull request as ready for review December 13, 2024 15:16
@icewind1991 icewind1991 merged commit ef19f1f into stable29 Dec 13, 2024
45 checks passed
@icewind1991 icewind1991 deleted the backport/3481/stable29 branch December 13, 2024 15:26
@icewind1991 icewind1991 mentioned this pull request Dec 13, 2024
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Items that need to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant